Clear npcs before terrain and vehicles #78679
Merged
+1
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Code: Tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
None
Purpose of change
GCC9, Curses, LTO test fails when clearing npcs.
https://github.com/CleverRaven/Cataclysm-DDA/actions/runs/12429756955/job/34703884138?pr=78676#step:19:102
There were also rare older issues when npcs were underground. I'm not sure if those still happen, but they should be fixed by this, too.
Describe the solution
Simply swap
clear_npcsandwipe_map_terraininclear_map.Describe alternatives you've considered
Testing
I couldn't easily find a reproduction case to test this, as it appears to be linked to compiling with LTO. But it seems to be guaranteed with that currently, so if it passes here it should be good?
Additional context